From 6836bfc208304781332652cd38c28b581ba10cfa Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 28 May 2019 23:37:51 +0000
Subject: [PATCH] toolbar: make final

---
 gtk/gtktoolbar.c | 23 +++++++++++++++++++++++
 gtk/gtktoolbar.h | 37 ++-----------------------------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index e0f51c1b6b..5d031475ea 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -106,6 +106,29 @@ typedef struct _ToolbarContent ToolbarContent;
 #define SLIDE_SPEED 600.0	   /* How fast the items slide, in pixels per second */
 #define ACCEL_THRESHOLD 0.18	   /* After how much time in seconds will items start speeding up */
 
+typedef struct _GtkToolbarPrivate       GtkToolbarPrivate;
+typedef struct _GtkToolbarClass         GtkToolbarClass;
+
+struct _GtkToolbar
+{
+  GtkContainer container;
+
+  GtkToolbarPrivate *priv;
+};
+
+struct _GtkToolbarClass
+{
+  GtkContainerClass parent_class;
+
+  void     (* orientation_changed) (GtkToolbar       *toolbar,
+                                    GtkOrientation    orientation);
+  void     (* style_changed)       (GtkToolbar       *toolbar,
+                                    GtkToolbarStyle   style);
+  gboolean (* popup_context_menu)  (GtkToolbar       *toolbar,
+                                    gint              x,
+                                    gint              y,
+                                    gint              button_number);
+};
 
 struct _GtkToolbarPrivate
 {
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 1b56716528..85ef52b9b7 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -43,42 +43,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_TOOLBAR            (gtk_toolbar_get_type ())
 #define GTK_TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
-#define GTK_TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
 #define GTK_IS_TOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLBAR))
-#define GTK_IS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLBAR))
-#define GTK_TOOLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass))
-
-typedef struct _GtkToolbar              GtkToolbar;
-typedef struct _GtkToolbarPrivate       GtkToolbarPrivate;
-typedef struct _GtkToolbarClass         GtkToolbarClass;
-
-struct _GtkToolbar
-{
-  GtkContainer container;
-
-  GtkToolbarPrivate *priv;
-};
-
-struct _GtkToolbarClass
-{
-  GtkContainerClass parent_class;
-
-  /* signals */
-  void     (* orientation_changed) (GtkToolbar       *toolbar,
-				    GtkOrientation    orientation);
-  void     (* style_changed)       (GtkToolbar       *toolbar,
-				    GtkToolbarStyle   style);
-  gboolean (* popup_context_menu)  (GtkToolbar       *toolbar,
-				    gint              x,
-				    gint              y,
-				    gint              button_number);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
+
+typedef struct _GtkToolbar GtkToolbar;
 
 GDK_AVAILABLE_IN_ALL
 GType           gtk_toolbar_get_type                (void) G_GNUC_CONST;
-- 
2.30.2